switch trackfilter name matching to use QRegExp.
authortsteven4 <tsteven4@gmail.com>
Tue, 10 Jun 2014 21:49:15 +0000 (21:49 +0000)
committertsteven4 <tsteven4@gmail.com>
Tue, 10 Jun 2014 21:49:15 +0000 (21:49 +0000)
gpsbabel/trackfilter.cc

index 16f55127084dd3a87a70739471bbd0b8c1786d78..d7e8b212ed5b74e26a76a02c6bc51ef115592982 100644 (file)
@@ -40,6 +40,7 @@
 #include <ctype.h>
 #include <math.h>
 
+#include <QtCore/QRegExp>
 #include <QtCore/QXmlStreamAttributes>
 
 #include "defs.h"
@@ -333,8 +334,7 @@ trackfilter_fill_track_list_cb(const route_head* track)     /* callback for track_d
   }
 
   if (opt_name != NULL) {
-    if ((track->rte_name == NULL) ||
-        (case_ignore_str_match(CSTRc(track->rte_name), opt_name) == 0)) {
+    if (!QRegExp(opt_name, Qt::CaseInsensitive, QRegExp::WildcardUnix).exactMatch(track->rte_name)) {
       QUEUE_FOR_EACH((queue*)&track->waypoint_list, elem, tmp) {
         Waypoint* wpt = (Waypoint*)elem;
         track_del_wpt((route_head*)track, wpt);